Merge ""Steal" single value variables in rbc inheritance" into main am: 0c2ef754

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



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