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

Change-Id: Iad4733094961f439e4bfa8acd289cca77158e130