add SUPERUSER_PACKAGE_PREFIX in prep for switch to new superuser

Change-Id: I0b880a6d0f9cf36c0a8419ec00fc978245adbb6f
Merge remote-tracking branch 'origin/cm-10.1' into cm-10.1