RepoPick: Actually skip merged commit instead of exiting

PS2: add missing semicolon

Change-Id: Ib67f2444878bcde23acc0300782b68c791989286
Merge "RepoPick: Actually skip merged commit instead of exiting" into cm-11.0
BoardConfig.mk.template: Add TARGET_CPU_VARIANT

Change-Id: I8cd74a794e0d1a6818b5479cf7f5264e87d565f3
Merge pull request #3 from CyanogenMod/cm-11.0

Cm 11.0