-- aligning android project with travis reqs
--
Merge branch 'dev' of github.com:zafarella/caao into dev