Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  Support darwin/linux specific go sources

Test: add darwin/linux specific sources
Change-Id: Idac206cd3faeb91f07ac5609d2883f446b20f28b