Merge "ART: Fix old warnings" am: 3f8d2d88eb am: 31b108570f
am: 91f6bff0f2

Change-Id: I310ddcf26641f08a7eb082971ad773b7cbc4722f