Merge "stagefright: Add support for levels 6+ for AVC/H.264"