Development: Root for apps is unavailable if the su daemon isn't running

The superuser options are tied to the Superuser app variant we use,
which in turn is tied to the su daemon. No daemon, no menu options.

Change-Id: I41d58e62986759336ab38e67f26a558c2eed5aa3
Merge branch 'cm-11.0' into kk_mkt