Switched to local android dependencies.
Switched to local android dependencies.
Merge branch 'develop'