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

* aosp/upstream:
  Fix format issues found by go vet
  Fix glob cache conflict when excludes=nil and excludes=[]string{}
  Store build.ninja deps in .ninja_deps

Test: m checkbuild
Change-Id: I914f0f1b4b66abdb69d912889907a6f471256176