am 31c81e9e: am b8111f83: Merge "Fix potential double close in...
am 31c81e9e: am b8111f83: Merge "Fix potential double close in IMediaMetadataRetriever::setDataSource"
* commit '31c81e9e':
Fix potential double close in IMediaMetadataRetriever::setDataSource