Add FFMPEG libraries to Android build. Update ffmpeg submodule.
Merge branch 'cv47-patch2'