Merge "Revert "Revert "Enable verity on userdebug, and add disable-verity to adb"""