Merge "Revert "NdkMediaExtractor: per-sample format metadata API""