Merge "Revert "Expose SdkMediaExtractor entry point to MediaMetrics""