Backed out 2 changesets (bug 815682, bug 897711) for Android S4 failures.

Backed out changeset 14f00ee7be7d (bug 897711)
Backed out changeset 3de21c283716 (bug 815682)