FIX: [droid] Handle mouse wheel
FIX: [droid] do not package non-standard joystick keymap
CPUInfo: additional cleanup for CPU string
Merge pull request #3658 from koying/fixdroidmousewheel

FIX: [droid] Handle mouse wheel
Merge pull request #3664 from koying/quickpr

FIX: [droid] do not package non-standard joystick keymap
Merge pull request #3673 from Karlson2k/fix_cpu_name_01

CPUInfo: additional cleanup for CPU string
fixes PVR channel icon scan
[subtitles core] set correct icon