Merge "qcom: secure_buffer: Use enum type to hold VMID definitions" into msm-4.8