Merge pull request #3 from EmilWestergren/master

Added some flags when generating Android.mk file
Merge branch 'master' of https://github.com/cogneco/rock
Merge pull request #4 from EmilWestergren/master

Fixed indentation
Merge branch 'master' of https://github.com/cogneco/rock