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

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

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



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