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

Change-Id: I8f8309209e5467c6e506426952f7a5c0ece54b6b