Quick/dirty fix for Android build
Remove incorrect special case treatment for Android dependencies