Merge remote-tracking branch 'aosp/upstream'

* aosp/upstream:
  Cap the number of cpus for Go compiles
  Try to make GOROOT relative in Go 1.10

Bug: 74093084
Test: check goroot in out/soong/**/build.ninja
Change-Id: Ic49c2a07e9b076cd2797a129a1f5dc561871abe2