Merge "Fix the JNI documentation for ICS."