Merge "Sort inherited products correctly" am: 0339142a am: 188e38ec am:...

Merge "Sort inherited products correctly" am: 0339142a am: 188e38ec am: 8444f7fd am: f585c50d am: 86d66377

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



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