Backed out changeset 1646e649878a (bug 835698) for causing bug 839256.
Backed out changeset 8507903e43cb (bug 831989) for landing with the wrong bug number in the commit message.
Bug 839936 - Build fails in content/base/test because the command line is longer than 32k chars, r=ted