Merge pull request #75 from jhoffmannrim/master

Update for NDK 10.2 Gold