Google is fixing this in the best way possible. Instead of having a 'Windows Phone', a 'Blackberry', an 'Apple', and an 'Android', you now have a 'Galaxy', a 'Droid', a 'Nexus', and an 'Android' (cheap Chinese), etc.
This means that instead of Blackberry now competing against just Android and being a go-to choice if you didn't like Android, they're now competing in mind share with each individual manufacturer. This is going to be very bad for non-Android, as their brand share is now being heavily diluted among countless choices for general consumers.
Brilliant marketing play - I wonder if it's a conscious move by the Android alliance, or it's just playing out naturally?