Merge "Revert "Include su.te only for userdebug/eng builds."" into jb-mr1-dev-plus-aosp