Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-dev
automerge: 7feb222

* commit '7feb222f57a3f9ce9d03cb574486e05533f8ef9f':
  Fix problems with DexClassLoaderTest.