Rel candidate to java win32

Merge rel candidate branch to java_win32