Merge "Update combined build.ninja to depend on Soong's build.ninja" am: 77ecb3347b
am: b4b655a7af

Change-Id: I0867e0d6402f95b04a034148562d731869f2a622