jcsullins: Camerahal updates to match