FIX: android x86 build
Merge pull request #279 from koying/fixdroidx86

FIX: android x86 build
Merge remote-tracking branch 'xbmc/master' into pvr.wmc