Merge "Align size of vbmeta image to 4k boundary"