Merge "ART: Improve double-JNI-load exception message"
am: 594bccc128

Change-Id: I74042b60ad28bbbd75b55d5600656050a28eb766