Backed out changeset f5a10853e457 (bug 858340) for Android bustage on a CLOSED TREE.