Merge "Make vdex and dexlayout compatible."