Merge "CameraService: Remove device HALv2 support, other cleanup"