Merge "[androidbp] address comments aosp/149217" into master-soong