Merge "Fix NullpointerException in MediaMetadataRetriever"