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

Change-Id: I1aac1bdccaa3a08fa86194184797a2875cb5b81c