Merge "Camera: update CameraModule deriveKey" into mnc-dev