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