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

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

Change-Id: I4bb644f9090f1166e4704ef507a58e55ee482d1f