Merge "ART: Fix old warnings" am: 3f8d2d88eb
am: 31b108570f

Change-Id: Ifba57692a1f1a7efd9ae4b9b3b901393efd2f064