Merge changes from topic "run_dex2oat_test" am: 8971b49161 am: 151a52e1eb

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

Change-Id: Ia4295ab0b3027aadf86032a28132f84ebaf8f120