Revert [1/3] Manifest: Built-in superuser

Change-Id: I0723d30fe2abcb3f8544dcf1dadb6dd512abb22d