[automerger skipped] Merge "Refactor BoardConfig.mk for emulator products" am: 87399730de
-s ours
am: ec61443226
-s ours
Change-Id: I19195ad0022662dfe1a4917adfe279100aa06234
This commit is contained in: