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

Change-Id: Icdd0eb7e8120da39b28041595333a52a1dd241bb