Merge "libfs_avb: support enable verity for a standalone partition" am: 30fef71b2c
am: 22854d0548

Change-Id: Iffca76e71403c5f9d1685546e4403390378a6d70