Backed out changeset c2ee81c83a01 (bug 1051087) for Android bustage.
CLOSED TREE

--HG--
extra : amend_source : 46094402a2713e6ecf09399776334a7553340903