Merge "Align size of vbmeta image to 4k boundary" am: efb6fddf39 am: 95202bcba6 am: 412138338e  -s ours
am: fcca0811ca  -s ours

Change-Id: I29a910df08174cdc8c2c9c557eb5db5ec63bb098