Merge "Revert "Revert "Stop using the runtime classpath in dex2oat""" am: 293bfbdbed am: 412fefa570
am: c7c7f118ce

Change-Id: I48e4921b22cf8b853e5301fed9e0da7ba58ba7ac