Merge "Align method code rather than method header in oat files."