Merge "Add AVIF mime type to android.mime.types"