Merge "Fix inheritance order" am: 5e0edffa am: 2fbf34c2 am: 12c44758 am:...

Merge "Fix inheritance order" am: 5e0edffa am: 2fbf34c2 am: 12c44758 am: 7679a8e6 am: 046ad31e

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



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