Merge "ART: Fix tidy warning in patchoat"
am: ae9c6e52bb

Change-Id: I086e918910754208f5a89d8cef6d1a66efcc864b