Merge "ResourceLoader::filter: use APC when running under HHVM"