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

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



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