Fix arm32 code generator when used with baseline compilation. am: 9b195cc7fc
am: e04d1df311

Change-Id: I0c7351c3007da554c32b41d82516189909242a22