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

Change-Id: I542e39b55dfc15ad2cefb272e91b732329ad327c