[musicdb] combine triggers so we have a single trigger per table - mysql requires this
FIX: [droid] handle usb storage
FIX: [droid] cpu load info with vanilla ndk
Merge pull request #3911 from koying/fixdroidusbstorage

FIX: [droid] handle usb storage
Merge pull request #3917 from koying/fixdroidcpuload

FIX: [droid] cpu load info with vanilla ndk
[musicdb] use a temporary table for the updating of strJoinPhrase in song_artist and album_artist, as mysql can't handle (potentially) circular updates
Merge pull request #3905 from jmarshallnz/music_triggers

[musicdb] combine triggers so we have a single trigger per table - mysql requirement
videodb: fix SQL query in GetMatchingMusicVideo
[musicdb] fix incorrect query for song by artist/album/title. fixes #14775
[win32] Update sqlite to new bugfix version from same branch
Compile by MSVC using same settings as other XBMC dlls
Include .pdb file
droid: fixed, do not fail removing files that might not exist
droid: changed, make sure we start with clean dirs before packaging to avoid including stale items
ActiveAE: suspend hdmi audio during change of refresh rate
Merge pull request #3918 from Karlson2k/fix_update_sqlite

[win32] Update sqlite package to new bugfix version from same branch
Merge pull request #3797 from FernetMenta/hdmiaudio

ActiveAE: suspend hdmi audio during change of refresh rate
Merge branch 'master' of https://github.com/xbmc/xbmc into temp

# By Jonathan Marshall (3) and others
# Via Chris Browet (2) and others
* 'master' of https://github.com/xbmc/xbmc:
  ActiveAE: suspend hdmi audio during change of refresh rate
  droid: changed, make sure we start with clean dirs before packaging to avoid including stale items
  droid: fixed, do not fail removing files that might not exist
  [win32] Update sqlite to new bugfix version from same branch Compile by MSVC using same settings as other XBMC dlls Include .pdb file
  [musicdb] fix incorrect query for song by artist/album/title. fixes #14775
  videodb: fix SQL query in GetMatchingMusicVideo
  [musicdb] use a temporary table for the updating of strJoinPhrase in song_artist and album_artist, as mysql can't handle (potentially) circular updates
  FIX: [droid] cpu load info with vanilla ndk
  FIX: [droid] handle usb storage
  [musicdb] combine triggers so we have a single trigger per table - mysql requires this