aml_art_340915060 (10774978,com.google.android.art)
Snap for 10453563 from d608568a4d220cc73ce87193ba5b6b7afd22bbdb to mainline-art-release

Change-Id: I68dbf9824ede7392c457ab01eec4f4f76a099dfd