Merge "ART: Simplify patchoat"
am: 47a2a45a66

* commit '47a2a45a6673ddf3322115ff5058763f82a9368f':
  ART: Simplify patchoat