Backout 2571b6bbc93a (bug 894885) for possibly breaking Android tests
Backout 823a6f7499f8 (bug 894313) for possibly breaking Android tests on a CLOSED TREE