BoardConfig.mk.template: Add TARGET_CPU_VARIANT

Change-Id: I8cd74a794e0d1a6818b5479cf7f5264e87d565f3
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0