Merge pull request #851 from dgkoch/dgkoch_build_fixes3

Fix Android build errors