Merge "Make sort as part of the inner command" am: 859d43a1

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



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