Backed out changeset aadb205e7f05 (bug 881681) for Android Armv6 refteset-2 failures