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

Change-Id: Ie9857d6a6186782856d2e0149d01a9235dbd17d7