am ad21a81a: Merge "stagefright: Fix issue with tracking media format in...
am ad21a81a: Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev
* commit 'ad21a81a':
stagefright: Fix issue with tracking media format in packet source