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

Merge commit '8c1eeffe4339530cb76572588330a698bccb622c' into eclair-mr2-plus-aosp

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