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

Change-Id: I8aaad725f691d3e3cc4e3262853365c360d1d95a