Backed out changeset 230120afcbbf (bug 905589) for Android and B2G bustage on a CLOSED TREE.