Merge "msm: crypto: Add support for map and unmap ioctls"