Fix inclusion order

Do not reset the build variables after including the shared components...
Merge branch 'cm-10.2' into martincz