Merge "Change visibility of bp2build proto for dir rename" am: 7c7409d5 am:...

Merge "Change visibility of bp2build proto for dir rename" am: 7c7409d5 am: 41097e29 am: 256a8292

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



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