Fix Repopick Errors

Fixes errors after the gerrit update yesterday.

Change-Id: Ie2a9a4371af682056acc7cdad5426e40f0f2504c
RepoPick: Actually skip merged commit instead of exiting

PS2: add missing semicolon

Change-Id: Ib67f2444878bcde23acc0300782b68c791989286
build: tools: device: fix the failing recovery builds when using mkvendor.sh

4.3 requires the cpu variant to be set. set it to generic to fix the build

Change-Id: Iab8ce2776ca887330bb0fe1366826ef306dd848c
Merge branch 'cm-10.2' into martincz