Merge "MediaFrameworkTest: don't set surface if video format is unsupported"