Merge "Fix filedescriptor leakage in MediaMetadataRetriever"