Backout bug 872806 for multiple android test failures