Change up superuser settings - fix root

Change-Id: I7faf12a29271731c5baaa4c78fa8e503d456c7b9
Merge "Change up superuser settings - fix root" into lollipop