Merge pull request #381 from hghwng/master

Fix compilation on Android.