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

Change-Id: I43969fc5871a03bb293605e8ac7fc11f6afe878b