am de8b6a5d: Reconcile with AOSP

* commit 'de8b6a5d99da277edf17b741805cc2992f940ab9':
  Update board-info.txt