Merge "Align size of vbmeta image to 4k boundary"
am: 6b126fb7bc

Change-Id: Ibf96152b0b1650e33e5d300c05001e84a8253330