Merge "Handle '&' in DexoptUtils#encodeClassLoader" am: cef5431093 am: e563c6fe6d  -s ours
am: 11cab01c6c  -s ours

Change-Id: I12146be9acee7d68e2ac564659b629ed8d24e62d