Merge "Remove obsolete assets from target /system/media/video/" into klp-dev