Merge "Revert^2 "Support shared libraries in CreateContextFromClassLoader.""