Merge "Camera: update VTS for new useHalBufManager feature"