Backed out changeset 45975a811207 (bug 914508) for Android 2.2 NoIon build bustage