Merge "Deprecate some status bar icons that now come from the phone app (and shouldn't have been public in the first place.)" into gingerbread