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

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

Change-Id: I529e89400a980a585ba295c5e4a5fa985a1120be