Merge "Fix passing --classpath-dir to dex2oat for split apks."