vanir-ize

Change-Id: I945a551fa52386c4879e9bf075181a3c12e25b05
CM extractor and mako-vendor.mk include

Change-Id: I2c2bfe1cddaca1b09cb7c96cd341e8c62721fbb8