Backed out 2 changesets (bug 984503) for android build bustage

Backed out changeset 579667582c6a (bug 984503)
Backed out changeset 56c4334e838f (bug 984503)