Also fixes ARM assert build -O3. Change-Id: I52bda91308ecfa0e8b23c4140c38c49347cc10f7
Change-Id: I9a3071b94dd2e9bfe2e3b162994e06ae10077b5a