Merge "Revert "Revert "Stop using the runtime classpath in dex2oat"""