update android port for language changes
Merge pull request #8 from aydinkim/android

update android port for language changes