Merge "Add InMemoryDexClassLoader test with null parent" am: adb89d692f
am: 51338086cf

Change-Id: I19ddb9e10244d172efdc20b24cea67eac41e7950