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

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

Change-Id: I96498694618a86d42b3306ed8816a0d570d558e3