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

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



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