Merge "ASoC: msm-cpe-lsm: cleanup ioctl functions" into msm-4.9