am 068fffef: Reconcile with AOSP

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