Merge "ART: Fix tidy warnings"
am: 3773f21068

Change-Id: I3e6c7ba9c2012a4f76335ff1b990760b3b042e1d