Merge "Move InMemoryDexClassLoader to be a subtype of BaseDexClassLoader" am: d43e2f40b4
am: 639cb6f19a

Change-Id: I56bac6c2be518e10d34c08a8d98bd36712f2b075