Add dependencies
More dependency fixes
Merge branch 'android/api' into develop