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

* commit '3b10364b92af0b4a9c69e63564a605e792223807':
  Have all targets in build.ninja