Trying to fix hhvm build matrix