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

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



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