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

Change-Id: I5902098ef05423e18e06480de4f2b9eee8d70e0f