Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread