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

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



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