Merge "Clean up MediaMetadataRetriever use"