Merge "NuMediaExtractor: remove NuCachedSource2 reference"