am 973a7c7e: Reconcile with AOSP

* commit '973a7c7e6588a4ef1fe00fafa94f53d06db85b42':
  Update board-info.txt