Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39
am: 95202bcba6

Change-Id: I9b9a5faf158157fbb34d18c4e7107e137411634d