Merge "Support to add JNI of both archs in multilib build."