Android project cleanup.
Merge branch 'master' of bitbucket.org:eceandy/avtech