Merge "Only pass NINJA_ARGS to the main ninja compile"