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

Change-Id: I3c9edadb74165bdc905a6a5398258b75566629e7