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

* commit 'f17f8b49c92d5a10537cc28f29039e07b1ec17a5':
  Have all targets in build.ninja