Merge "Fix inheritance order" am: 5e0edffa am: 2fbf34c2

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



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