Also cleaned up some if (hhvm) logic in the files I was touching anyway.
This change is mostly for FB internal organizational reasons. Building is not effected beyond the fact that the target now lands in hphp/hhvm/hhvm rather than src/hhvm/hhvm.