Fix Memory SimpleXML and Redis from hhvm master