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

Change-Id: I14c327909c428ec77d0cdcc2d378966643bc434f