Merge "Move bpglob out of ToolDir" am: fe8ceadabf am: d04190d6fb am: 698b12820d

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

Change-Id: I9d55e3273d1b95ef79e2f7e6288b7fdbef66ddeb