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