For 32-bit ARM devices align method headers and code to 64-byte boundaries.
am: 521ff98809

Change-Id: Ic07579caa05fb05ff0b2564df71fb04d95c3668d