Improve env switch on hhvm builds

And restore hhvm-* env to test built phar