Merge "CameraITS: Update Camera ITS build/envsetup.sh."