Android dependencies

Adjust the dependencies between modules on android.