am a714c73f: am ba360acf: Reconcile with AOSP

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