Merge changes from topic "colefaust_mksort" am: 4cbfa0d7 am: bf329541 am: a207cfda

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



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