camerahal: minor changes to match flintman