Merge "Don't type variables as booleans in mk2rbc" am: 70079c11 am: 6c2030b3

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



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