Merge "ART: Rework Generic JNI, add ARM version"