am 85fa5581: Reconcile with AOSP

* commit '85fa55814b52f182504333d5512d68e29e7f2932':
  Update board-info.txt