Merge "defconfig: arm64: Enable USB GSI function driver" into msm-4.8