Fix for android build
Merge pull request #1495 from seanpaultaylor/next

Fix for android build