Backed out 2 changesets (bug 1052276) for causing various Android failures

Backed out changeset fb6d69690255 (bug 1052276)
Backed out changeset 14a934f9c207 (bug 1052276)
Bug 1042829 - Updated Android sdk to 20. r=mfinkle