Merge "DefaultContainerService's JNI library is required"