am cac2fd30: Merge "Revert "Use a build-specific wifi country code"" into klp-dev

* commit 'cac2fd302e844a4a46bb1749a2d2ed4739b4dc53':
  Revert "Use a build-specific wifi country code"