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

This reverts commit 152d2d42.

Fixed build error, and also fixed memory leak spotted from warning.

(cherry-pick of bbb36319.)

Bug: 17691572
Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981