aml_art_331612010 (9671952,com.google.android.art)
Snap for 8564071 from 6d2ffb9ab7f8de0fc513aebaeff15cbec1354240 to mainline-art-release

Change-Id: I302732d599ed8b5980875418b9ca9d97ecbecf88