Merge "ThumbnailUtils: To fix misuse of FileInputStream."