am e6436819: am 7feb222f: Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-dev

* commit 'e643681966cc64a0329848daf164b15ad2dd0f44':
  Fix problems with DexClassLoaderTest.