Merge "Build rule updates for aosp" into master-soong