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

Change-Id: Ib151e11c5d9d6e05cbfe71056910c799444c7b2b