Backed out 5 changesets (bug 834172) for Android build bustage.