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

* aosp/upstream:
  travis: run short tests with race detector enabled
  Let mutators use ctx.AddNinjaFileDeps
  Add TopDownMutatorContext.CreateModule
  Replace unpack's replace semantics with append
  Rename newModules to newVariations
  Rename moduleInfo.moduleProperties to properties

Test: m -j checkbuild
Change-Id: I95eaeabbac307124fdc42249f315ad8e172ca029