Revert "chrome/installer/mac: set -x in sign_app and fix unquoted variable expansion" and "//chrome/installer/mac: add entitlements during code signing"

This reverts commits a221822f30fb4ae70dcfac45b581bf95f312b8c0 and
b69d8c48da838196d9655402dd739e62227762a7.

Bug: 850890, 848052
Change-Id: I1b34c71d6522a051abc44a00b43b2466edffe51b
Reviewed-on: https://chromium-review.googlesource.com/1093119
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Martin Kreichgauer <martinkr@google.com>
Cr-Original-Commit-Position: refs/heads/master@{#565701}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: e25c04d02eb0d12a48e506dc82df9c421f8203a7

util/branding.gni

@@ -20,8 +20,7 @@ _branding_dictionary_template =
     "bundle_id = \"@MAC_BUNDLE_ID@\" " +
     "creator_code = \"@MAC_CREATOR_CODE@\" " +
     "installer_full_name = \"@PRODUCT_INSTALLER_FULLNAME@\" " +
-    "installer_short_name = \"@PRODUCT_INSTALLER_SHORTNAME@\" " +
-    "team_id = \"@MAC_TEAM_ID@\" "
+    "installer_short_name = \"@PRODUCT_INSTALLER_SHORTNAME@\" "
 
 _branding_file = "//chrome/app/theme/$branding_path_component/BRANDING"
 _result = exec_script("version.py",
@@ -42,5 +41,4 @@ chrome_product_installer_short_name = _result.installer_short_name
 if (is_mac) {
   chrome_mac_bundle_id = _result.bundle_id
   chrome_mac_creator_code = _result.creator_code
-  chrome_mac_team_id = _result.team_id
 }