Merge "ART: Fix old warnings"
am: 73321bfdd7

Change-Id: I0fe11a7df55e778587bc98a0ee9a7756c54c2361