Back out 01207a5deca5 and 34e30f1b46d8 (bug 848939) for Android bustage