Merge "Add vbmeta image support for verified boot" am: 8bc5c8521a am: 5e3590e81e
am: 0bba8acf3f

Change-Id: If9bd32b948191dec36dab0ec950960836f0738c6