am 6ec320df: Merge "Have all targets in build.ninja"

* commit '6ec320df174b6f1dd17023e20fc642f89bb83b4c':
  Have all targets in build.ninja