Merge "Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39" into stage-aosp-master
am: fd9315668e  -s ours

Change-Id: Ib25c47f4e4761e861e11027b1e110a5bbb8feec0