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

Change-Id: I1bdfabb16b26169ae84893b7f3ac35199804ab98