Merge "stagefright: support for video decoder metadata mode"