issue #5183, refacotr some variable names
issue #5183, fix android compile error
issue #5183, fix win32 compile error