Merge "Change fs-verity setup to the new format"
am: a825bc7ed3

Change-Id: If80778ec120cd506b65770241ee2272fc5c6615b