Merge "Update cqueries for bazel rules dir rename" am: c2cdd8ab am:...

Merge "Update cqueries for bazel rules dir rename" am: c2cdd8ab am: ac8b11b2 am: 0d91173d am: 00877dde

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

Change-Id: I44f81daa63ca95f71f628d7cc4d1ebd09ea01c16