Merge "MediaMetadataRetriever: Fix null pointer exception"