Merge "Bp2build support for soong config variables + os" am: 06981215 am:...

Merge "Bp2build support for soong config variables + os" am: 06981215 am: 60fff115 am: 89aed7bc am: 6234e1ff am: d5805353 am: 4af92926

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



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