Merge "Export some make variables to Bazel through product variables." am:...

Merge "Export some make variables to Bazel through product variables." am: 773e098d am: a8afca7f

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



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