repopick: handle variant hal branching

Change-Id: Ib0dee19abc13a7fb8d8e42c09b73c1b4f35ca938
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0