Merge "stagefright: convert kKeyFrameRate between msg and meta" into mnc-dev