Back out caa126fcb928 (bug 885717) because of Android build errors