[automerger skipped] More performance improvements am: 74a1a483 am:...

[automerger skipped] More performance improvements am: 74a1a483 am: 0a30b36d -s ours am: 1c804d12 -s ours

am skip reason: Change-Id I41fb7611030dd3ba824f896a9c9eadbdd218f464 with SHA-1 74a1a483 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11830142

Change-Id: Ib1728a00d8a61b9710962dfce12eb8d5229f423e