Merge "Revert "Stop using the runtime classpath in dex2oat""
am: df2a410bd5

Change-Id: I87f70f17e12d90fd431da5d64eeac3e5fa41b130