This speeds up certain workloads considerably, particularly those involved in buildling apps via the SDK. Windows-based use should particularly benefit from the change. (cherry picked from commit d8dde13a63565dcd72bcf03a5088407b737ba793) Change-Id: I33835bc64ade77688d41e8bfcd371b0a5f59d8fd