Merge "Add support for class loader context in dex2oat" am: 5fd8e8146b
am: e47dcd33a6

Change-Id: I28a97227645c112a3501a5e8ec6dc050ed16d7a7