am 5c667437: am 647260b2: Merge "Use zero filled alignment padding before method code"

* commit '5c667437d7df50bb1e63419dbb34afdc7054c310':
  Use zero filled alignment padding before method code