Merge "Use OUT_DIR to find the r8/d8 binaries instead out hard coded out/" am:...

Merge "Use OUT_DIR to find the r8/d8 binaries instead out hard coded out/" am: 76017c93 am: 9d192c82

Original change: https://android-review.googlesource.com/c/platform/build/+/2098796



Change-Id: Ic27de365583d07e8d2db63ff030b23671db964b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>