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