Merge "Revert "CameraVTS: build with static libhidlbase"" into main