Fixed Android SDK build - again.
Merge pull request #1697 from SpecLad:sdk-redux