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

Change-Id: Ie921d9d5f0058b44dc3b623227d812b78629b889