Merge "Make vdex and dexlayout compatible." into oc-dev