Merge "Disable parallel make for easier debugging"