Merge "Use propper default service implementation for keymaster HAL"