Revert r27972 to fix FS#11610 (but in a way android builds still work).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28050 a1c6a512-1295-4272-9138-f99709370657
4 files changed