Merge "Update public API after libcore InMemoryDexClassLoader change"
am: a21de6f376

Change-Id: I90b801cee1d6cb965fedf2e029f01365aac87887