Revert "Simple hack to remove aosp su"

This reverts commit 7a8004217af7f9386b17392e87cc0d6691e66556.
Add patch to remove AOSP su command