changes to build with pa and the naming scheme so the output is not just 'cm-' :p

Change-Id: I6c5d42866b1891fa3667b292715b3f995b32695f