Backed out changesets 19dd0130c6ae and d986a560fbdd (bug 865387) for Android test failures on a CLOSED TREE.