[Build] Don't revert mkspec patches