Cleanup fixes

Merged Nicolas Pomepuy requested to merge Aza/vlc-android:cleanup_fixes into master

Merge request reports