Merge "Fix stack test on arm32"
am: 7ff1eb698c

Change-Id: Iea0a2a0e6f4658ec9b550216fc43f208f78122ae