Merge pull request #381 from anemator/master

Fix build process for Android 22