Track koush Superuser

Change-Id: Ia99c50320a413a971a231062dd93233dff5a64d7
Track CM su

Change-Id: I69a35d9e8f0f3a124e84646f9cae47ee495ffb9d