Merge "More performance improvements" am: 1d1bb3b94f

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

Change-Id: Ic7187f5a94fab73d6689326b3517c83db1a16487