Back out 39bcc4b7efc8+e268996cb988 (bug 912299) for Android build bustage