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