Merge "gpu: ion: Add header file for ERR_PTR" into msm-3.0