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

Change-Id: Iba803b75ce09f3ad56857cbdd103eba6ba9f1a20