Merge "stagefright: Fix issue with tracking media format in packet source"