Merge changes from topic "run_dex2oat_test" am: 8971b49161

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1395635

Change-Id: I62546194171ebc4b3889c05d49d415931d2e2a18