Merge "More performance improvements" am: 1d1bb3b94f am: 27d4463cf5 am: 02dcbdb3f9

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

Change-Id: Ic0fef9f2d8ddc33c4455e00021da278e41e1baa2