Merge "Use common helper functions for getting sorted map keys." am: 49b1e9b6ce

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

Change-Id: I2ad29eeb5a9b7a2b69854f945f8ed8f912655eff