Merge "Changes to drm and crypto HALs as part of client implementation"