Merge "Make vdex and dexlayout compatible." into oc-dev
am: 0aaac37581

Change-Id: If5ec2aea437e9cd0712b95977f2478052c0f2745