Merge "gpu: ion: Fix race between ion_import and ion_free" into msm-3.4