cm: Remove procmem and procrank from user builds

 * These need to be installed setuid, which is a no-no for CTS.

Change-Id: I68d111db2db675116e214108776aa13c848d0c9a
Put procmem and procrank back into non-user builds

Change-Id: I193a9607dad40043649de6fea1f9bf0ab0c437f1
cm: Allow devices to set the GMS client id

Change-Id: I6fdf3817a292ac64291e8f9506eddd7d33059344
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2