am ba360acf: Reconcile with AOSP

* commit 'ba360acf428ee603fa2ebe9d13a970ad73b327ae':
  Strip board-info.txt for AOSP