Merge "Fix passing --classpath-dir to dex2oat for split apks."
am: 24ff69485e

Change-Id: If467da70c5637b9025435ebf7e6900349564f815