Merge changes from topic "colefaust_mksort" am: 4cbfa0d7

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



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