merged in some aosp
this should fix the camera and using su