Merge "ART: Fix some pedantic warnings" am: b2fe778d2d am: 665e9030ff
am: ce33c8a2eb

Change-Id: I282ae2387248821baab18dacb6a0337b837a62c4