Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread