am 2b80317b: only auto-generate board= requirement if a board-info file is not specified

Merge commit '2b80317be27e5450d7212b10777992d782dcf90e' into eclair-plus-aosp

* commit '2b80317be27e5450d7212b10777992d782dcf90e':
  only auto-generate board= requirement if a board-info file is not specified