Merge "Fix single value variable inheritance order" am: 52233be2 am:...

Merge "Fix single value variable inheritance order" am: 52233be2 am: e7951493 am: 4a5e47d8 am: 0f7ccf23 am: 1d7c54da

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



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