am bbc01d82: Merge "Remove /proc/cpuinfo parsing"

* commit 'bbc01d825448a738160716f95d9cc38f2be5f4f1':
  Remove /proc/cpuinfo parsing