am 46acb881: am 5f88cdae: Merge "stagefright: convert kKeyFrameRate between...
am 46acb881: am 5f88cdae: Merge "stagefright: convert kKeyFrameRate between msg and meta" into mnc-dev
* commit '46acb881':
stagefright: convert kKeyFrameRate between msg and meta