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

Change-Id: I8bf4d30a46f185ba850c91d5324a9153fd5a1a36