Merge "remove all the crio, bbb, and 2014 code"
diff --git a/aos/build/build.py b/aos/build/build.py
index 39559b3..f963f0f 100755
--- a/aos/build/build.py
+++ b/aos/build/build.py
@@ -577,7 +577,8 @@
       if platforms & frc_platforms:
         to_download.add(architecture + '_frc')
 
-      if platforms & (self.platforms() - pie_sanitizers - frc_platforms):
+      if platforms & (self.select_platforms(architecture=architecture) -
+                      pie_sanitizers - frc_platforms):
         to_download.add(architecture)
 
     for download_target in to_download:
@@ -641,8 +642,8 @@
   def check_installed(self, platforms, is_deploy):
     packages = set(('lzip', 'm4', 'realpath'))
     packages.add('ruby')
-    # clang-format from here gets used for all versions.
     packages.add('clang-3.5')
+    packages.add('clang-format-3.5')
     packages.add('arm-eabi-gcc')
     for platform in platforms:
       if platform.architecture() == 'arm':