Merge "Clean up OatQuickMethodHeader after Quick removal." am: 75563e3 am: 20153e1
am: 9359f6b

* commit '9359f6b751902188e20ab28c8b94dfd78fa1eec3':
  Clean up OatQuickMethodHeader after Quick removal.

Change-Id: I79fcff36bd084e0edc2472a7a555699a60279a32