Backed out 3 changesets (bug 910189) for breaking android builds

Backed out changeset 119e40b61023 (bug 910189)
Backed out changeset 1c778892acc6 (bug 910189)
Backed out changeset 96816b5d7299 (bug 910189)