Merge "ART: Fix old warnings" am: 3f8d2d88eb am: 31b108570f am: 91f6bff0f2
am: 06c8173f20

Change-Id: If9bfb29ad78bcda9cda5b58498c7839fb91afce6