Backed out changesets 1f5713b14a2a, c30a353ecf23, and f4ef406c1256 (bug 836486) for Android and B2G bustage on a CLOSED TREE.