Backed out changeset f51db1b6c9a6 (bug 917942) for android rc4 bustage