[automerger skipped] Reduce the number of Soong invocations, and various other...
[automerger skipped] Reduce the number of Soong invocations, and various other minor script fixes. am: f39ef8aa am: f211fd2d -s ours
am skip reason: Change-Id Id21ef80c2334462836e217032fc5bf63b7cd04e1 with SHA-1 691503ea is in history
Change-Id: Ia85851e94f0c2900d7ff4c1b18aff4618580a896