Backed out changeset b9fc8a08a0c2 (bug 1042829) for various Android failures