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

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

Change-Id: I7a49a228b4b6a388f08f4a3bd8512acd80a812cc