Merge "Fix out/soong/Android-<>.mk reproducibility" am: 2e93eb702d am: 5ba520122b am: 82fe912d84

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

Change-Id: I221c8c488a7e05657316c678c42c8e0341e2a936