Unbreak barrier makefile

Move the makefile inclusion inside the device validation...
Merge branch 'cm-10.2' into martincz