Merge "Vboot1.0: remove code to read verity state in userspace"
am: 1cd30df584

Change-Id: I79a0b838b2aabcbf6083de7c75de5d219f14517f