Merge "ART: Generic JNI for x86"