Merge "Make buildroot.cquery determinisitc" am: 7a9626c6 am: 29fb9ead

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



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