Merge "Clean up OatQuickMethodHeader after Quick removal."
am: 75563e3

* commit '75563e34a4e64a8e805e6810b13e07f1cafec137':
  Clean up OatQuickMethodHeader after Quick removal.

Change-Id: I41575dd094edc1c1246672a34678665b668a8f36