Merge "Revert "Add variables in google3a_config for camera tuning"" into sc-dev