Backed out changeset 922daaaeb05a (bug 974627) for permament android s4 test failure