[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 -s ours
am skip reason: Change-Id Id21ef80c2334462836e217032fc5bf63b7cd04e1 with SHA-1 691503ea is in history
Change-Id: I22ce3e460a276d3abc11a6205fad2401ff9a512b