Backed out changeset 3e21362cd4dc (bug 1536387) for build bustage at CacheFileUtils.cpp on a CLOSED TREE.