Backed out changeset 34edd639e3d9 for Android bustage. a=bustage