Backed out changeset 2a7cae8b0b5d (bug 1067552) for Android 4.0 M8 test failures