Merge "Handle '&' in DexoptUtils#encodeClassLoader" into oc-mr1-dev
am: 3df5aa6fca

Change-Id: Ifa0a19d73b4570867630418085b67257b70f1224