Merge "Revert^2 "Support shared libraries in CreateContextFromClassLoader."" am: e99dadae am: fe5764e3 am: aa5a46a9 Change-Id: Ib28c398a15d2d4718a9f0413800c340ca80310ea