Merge "[automerger skipped] Reduce the number of Soong invocations, and...
Merge "[automerger skipped] Reduce the number of Soong invocations, and various other minor script fixes. am: f39ef8aa am: f211fd2d am: 6338f741 -s ours" into rvc-qpr-dev-plus-aosp