Merge "Revert "Allow ueventd to set verity.* properties""