am bc9c0619: am de8b6a5d: Reconcile with AOSP

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