Update arm sysroot image used by arm/linux builder.

This brings in the new libpcap2 package which was added
to the build script here:
https://codereview.chromium.org/51323006/

Also, remove support for install armel sysroot now that
all the builders are on armhf.

BUG=312380
R=thestig@chromium.org

Review URL: https://codereview.chromium.org/55233006

git-svn-id: http://src.chromium.org/svn/trunk/src/build@232816 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

linux/install-arm-sysroot.py

@@ -34,14 +34,9 @@ import sys
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 URL_PREFIX = 'https://commondatastorage.googleapis.com'
 URL_PATH = 'nativeclient-archive2/toolchain'
-REVISION = 12292
+REVISION = 12356
 TARBALL = 'sysroot-arm-trusted.tgz'
 
-# TODO(sbc): remove armel support once the transision to armhf
-# is complete.
-REVISION_ARMEL = 12203
-TARBALL_ARMEL = 'naclsdk_linux_arm-trusted.tgz'
-
 def main(args):
   if '--linux-only' in args:
     # This argument is passed when run from the gclient hooks.
@@ -55,10 +50,7 @@ def main(args):
 
   src_root = os.path.dirname(os.path.dirname(SCRIPT_DIR))
   sysroot = os.path.join(src_root, 'arm-sysroot')
-  if '-gnueabihf-' in os.environ.get('CC', ''):
-    url = "%s/%s/%s/%s" % (URL_PREFIX, URL_PATH, REVISION, TARBALL)
-  else:
-    url = "%s/%s/%s/%s" % (URL_PREFIX, URL_PATH, REVISION_ARMEL, TARBALL_ARMEL)
+  url = "%s/%s/%s/%s" % (URL_PREFIX, URL_PATH, REVISION, TARBALL)
 
   stamp = os.path.join(sysroot, ".stamp")
   if os.path.exists(stamp):