patches: merge update from vlc-android-0.1.2