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

Change-Id: I3f6c194934350ab32d540f89578a092468a8b728