Merge "Fix bug in InMemoryDexClassLoader loading"
am: cb8b10b6db

Change-Id: Ie2f7411a77be95f24cc9769a6ae6035ed5db4697