Merge vlc-android