Merge "androidbp: Defer local path printing" into master-soong