hhvm: use upstream patches to fix the build