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

* commit 'ab4f602448449e4b24c03dcd8fec2fbc6c4be4d1':