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

Change-Id: I369e41910ebb55722d4bcb65a5b01445be698482