Back out two changesets (bug 1024260) for android build failures on a CLOSED TREE
* * *
Backed out changeset 9d92de0ada7d (bug 1024260)
* * *
Backed out changeset 5264e512b53c (bug 1024260)