Merge "switch to using DIST_DIR env var for dist" into main am: f8e79197 am: cac2d40e

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



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