RepoPick: Actually skip merged commit instead of exiting

PS2: add missing semicolon

Change-Id: Ib67f2444878bcde23acc0300782b68c791989286
Change repos for dependencies
Cleanup some naming.