[osx/gtest] - fix linkage of xbmc-test binary (ffmpeg now needs expliciti linkage agaoinst framework VDA, and some new source files were missing in the makefiles)
[osx] - fix cmdline linkage of lixbmc.so and xbmc.bin - there is no circular dependency linker option on osx (e.x. -Wl,--start-group/--end-group) - so we still need to link in main.a for osx.
FIX: [droid] Handle mouse wheel
players: move more things into info structures for audio/video
dvdplayer: don't constantly hammer demuxer to get stream count

Note this could cause regressions in files where streams show
up during playback, but i think the demuxer signals such
situations now.
FIX: [droid] do not package non-standard joystick keymap
[LangCodeExpander] Update iso639-2 db.
[LangCodeExpander] Update iso639-1 db.
[LangInfo] Don't try to convert "original" to 3-letter code.
[LangCodeExpander] Add special mappings for missing 2-letter codes.
[transforms] cleanup the transform stack to eliminate unnecessary copies.
[transforms] extend the UI transform with the font scaling amounts
[subs] scale subs rendered with our UI stuff correctly when in windowed mode
Merge pull request #3626 from jmarshallnz/subs_ui_scaling

Fix subtitle scaling for text based subs during windowed video playback
fix incorrect time interval comparison in 8e2f2de2015684246603224d4ad8fc9035178307
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
FIX: [mediacodec] add qcom to white list (solves green screen issue)
FIX: [mediacodec] bail out if we don't support the color format