Merge "Handle '&' in DexoptUtils#encodeClassLoader" into oc-mr1-dev