Merge "Gallery2: add extra mimetypes to gallery manifest"