imported patch fix-build.patch