Fix android dependency versions

Fixes the android dependency versions to commits that are known to work well.