Merge "Camera: update service to support HAL3.4" into nyc-dev