Merge "Remove code size from OatQuickMethodHeader" am: e57087025b
am: 492b108791

Change-Id: I896892b64eeee4502569cba1dbff782a381374a7