Merge "Add build/soong/bin to the paths" into main