Merge "Fix remote execution of r8 and d8 in make" am: e9c253fe am: b261e8a2

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



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