Backed out changeset 9157ea42ff41 (bug 914925) for Android/B2G test bustage.