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

Change-Id: Ibc05db84f0678648058f4e6795bf548a8c0376d0