Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."