Move CM_EXTRAVERSION to the end of CM_VERSION
Merge branch 'cm-10.2' into cm-10.2-defy