Backed out 2 changesets (bug 982339, bug 985302) for Android crashes.

Backed out changeset f45d255f2e4c (bug 985302)
Backed out changeset 44385c278928 (bug 982339)