Merge "Add vbmeta image support for verified boot"
am: 8bc5c8521a

Change-Id: I7de333ee2b7502c0040c2f27f36c8059e188ec03