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

Change-Id: Ib5aa60aace094b1ef2ca1e5ca23eb56a944f8335