Merge "Changing FlashTask to take in apply_vbmeta"