Merge "ART: Fix old warnings"
am: 3f8d2d88eb

Change-Id: I3c0f7f4f29f5b9dd8eb85083305c7f9623a6f899