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

This reverts commit 99a31b8129b71aeeb08b3c33a39b0f7f97e74852.

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

(cherry-pick of 96e2e0ea682169fdaea1d5d163c39231a6f7041f.)

Bug: 17691572
Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
5 files changed