Backed out changesets 9aadf7e35e70 (bug 836517) and 493805ba1c85 (bug 834681) for Android test hangs.