Merge pull request #474 from mithro/master

Making the build green again.
Getting android working.