Merge "ART: Fix reference-related warnings"