Backed out changeset c63d8f19a893 for failures in Android mochitests.