Merge "USB: pd: Fix compilation issues for 32 bit support" into msm-4.9