Restore -desktop and -android Makefile targets.

I think -desktop and -android targets are useful, e.g., in case we need to do a desktop-only or an Android-only release.

Also, Android releases (except testbuilds) are always all-architecture (except for the browser project).