Include SuperUser also on user builds
Remove Optional Packages

Change-Id: I51c8aaf7ad5f679320d8543b6d16ec1cb2115e61