Add Android project
Merge branch 'amazonapi'