Merge "Treat UnsatisfiedLinkError as non-fatal"