Merge "Update combined build.ninja to depend on Soong's build.ninja"