backout b7cca8193389
skip failing tests on Android x86