HHVM: use ThreadLocal correctly

Change-Id: I7000e1feb524c0d3962291be9c4b11e4d85537e6
Merge "HHVM: use ThreadLocal correctly"