Merge "ART: Simplify patchoat" into nyc-dev
am: df3a54bf63

* commit 'df3a54bf63597095f2fac3d13b22a112eb6dcd6b':
  ART: Simplify patchoat