Fixes Android Dependency Issues