Merge pull request #3363 from thedax/master

Attempt to fix SDL build.
Attempt to fix Android build.