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

Merge commit '600b4bb655e96655b769f390a17a85ad20fc15a5'

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

hagar006/platform_manifest,ND-3500/platform_manifest,xorware/android_build,fallouttester/platform_manifest,xorware/android_build,xorware/android_build,see4ri/lolili,pranav01/platform_manifest,xorware/android_build,RR-msm7x30/platform_manifest,knone1/platform_manifest,xorware/android_build,Hybrid-Power/startsync