Backed out changeset 9d04bde9fcd1 (bug 989806) for Android mochitest failures.
Merge m-c to inbound.