Merge "Have all targets in build.ninja"