am d305c3ad: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/art into lmp-dev-plus-aosp

* commit 'd305c3ad8ead4e24cee0591dd64f46355e69adfc':