Merge "Handle '&' in DexoptUtils#encodeClassLoader"
am: cef5431093

Change-Id: Ia7495e6a9d12dc36e5091918426e86d9a9e76821