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

Change-Id: I65e3b54fdbbc4946dfbe498d189fdaae4d9bf563