core: fix cpu variant board flag

Change-Id: I6f412d36162e50012a1d2562ab05a331f248582c
Merge "core: fix cpu variant board flag" into cm-10.2