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

Change-Id: I6b8600da2ce3ec4468dfff320ebbc3bd05d0d440