Revert "Revert "remove obsolete superuser tweaks/fix raosp's local manifest""

This reverts commit 4ddbabdffc6995f168a3bdefc7e04b6bc2868c75.