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

Change-Id: Ie5664882ffbc7a8dd7749ee223128c35bc594940