Merge "Fix dependency graph computation in ndk-build"