add Superuser from CM

Change-Id: I46aefeb4c53d871d0b45209d7af2e43fb2b46c0d
track vold from omni

Change-Id: I4add3e58c153251ebcffbeb26f6ef9d66066310b
fix derp

Change-Id: Ie183a96267ec6dbdf541155b2835338b3bfab226