Backed out 2 changesets (bug 1053016) for Android build bustage

Backed out changeset 498a3f688a3d (bug 1053016)
Backed out changeset 314e44e93c71 (bug 1053016)