android platform bug fix
Merge pull request #1504 from syureyi/android_bugfix

android platform bug fix