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

* commit '20153e118f7301282416e04cc335a13c74d433ae':
  Clean up OatQuickMethodHeader after Quick removal.

Change-Id: Ifa40daca0093e714c4cd6edee59ecd799582bbf8