Merge "Rewriting "Audio and Video" section of Dev Guide." into honeycomb-mr2