am e389b1bd: am ad21a81a: Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev

* commit 'e389b1bdd13e768baa2532f537236b2c5e6243fa':
  stagefright: Fix issue with tracking media format in packet source