Merge "Abort for combination of compact dex/dexlayout and update_input_vdex"