Merge "ART: Fix reference-related warnings"
am: 7f57e05355

Change-Id: Iace1e3c8c130f2344af4c9c9d1c35907fc9a5d51