removed files unused by android app
re-ordered targets
merged with android-2.2 post cleanup
Merge branch 'master' into android