Revert "Update Android build for FFMPEG 2.5"

This reverts commit 0207ea68874af011eeb5bab863e0208dc764c19b.