Back out b7f50cfa3fe1 (bug 801739) for Android build bustage