Move some configuration from main.mk to config.mk am: cfabc42af9  -s ours am: 827554c1de
am: 826afd49fd

Change-Id: I2c35823527620c448b29888cbc7d6f01dc8a3982