Merge "ART: Replace 'auto' with actual types"
am: 763ae5b769

Change-Id: Ia1f4d50b37de877cbf41784a7a86c6c45b8e0105