Put procmem and procrank back into non-user builds

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