[automerger skipped] For 32-bit ARM devices align method headers and code to 64-byte boundaries.
am: 8eefb24601 -s ours
am skip reason: change_id I88f5f39381bf0331ce8540a929c6a68b3b5e0c75 with SHA1 521ff98809 is in history

Change-Id: Ib83a6913b7757fbb7c0516c9f2d0b3ff84257579