Merge "Ensure ClassPreDefine returned dex file is on the Classpath"