Merge "Change JniInvocation default to libart.so"