Whitespace only
Selectively add jni include subdirectories
Add win32 jni include subdirectory