Merge "Align method code rather than method header in oat files."
am: 35bb22f05c

Change-Id: I3b276be533e4d4841e3fbd8ac06aa6071c142d70