Keep intermediate .so files inside the ffmpeg directory.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=123203428

extensions/ffmpeg/README.md

@@ -39,7 +39,7 @@ For example, to fetch and build for armv7a:
 cd "${FFMPEG_EXT_PATH}/jni" && \
 git clone git://source.ffmpeg.org/ffmpeg ffmpeg && cd ffmpeg && \
 ./configure \
-    --prefix=../../jniLibs/armeabi-v7a \
+    --libdir=android-libs/armeabi-v7a \
     --arch=arm \
     --cpu=armv7-a \
     --cross-prefix="${NDK_PATH}/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-" \

extensions/ffmpeg/src/main/jni/Android.mk

@@ -18,22 +18,22 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libavcodec
-LOCAL_SRC_FILES := ../jniLibs/$(TARGET_ARCH_ABI)/lib/$(LOCAL_MODULE).so
+LOCAL_SRC_FILES := ffmpeg/android-libs/$(TARGET_ARCH_ABI)/$(LOCAL_MODULE).so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libavutil
-LOCAL_SRC_FILES := ../jniLibs/$(TARGET_ARCH_ABI)/lib/$(LOCAL_MODULE).so
+LOCAL_SRC_FILES := ffmpeg/android-libs/$(TARGET_ARCH_ABI)/$(LOCAL_MODULE).so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libavresample
-LOCAL_SRC_FILES := ../jniLibs/$(TARGET_ARCH_ABI)/lib/$(LOCAL_MODULE).so
+LOCAL_SRC_FILES := ffmpeg/android-libs/$(TARGET_ARCH_ABI)/$(LOCAL_MODULE).so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libswresample
-LOCAL_SRC_FILES := ../jniLibs/$(TARGET_ARCH_ABI)/lib/$(LOCAL_MODULE).so
+LOCAL_SRC_FILES := ffmpeg/android-libs/$(TARGET_ARCH_ABI)/$(LOCAL_MODULE).so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -41,5 +41,5 @@ LOCAL_MODULE := ffmpeg
 LOCAL_SRC_FILES := ffmpeg_jni.cc
 LOCAL_C_INCLUDES := ffmpeg
 LOCAL_SHARED_LIBRARIES := libavcodec libavresample libavutil libswresample
-LOCAL_LDLIBS := -L../jniLibs/$(TARGET_ARCH_ABI)/lib -llog
+LOCAL_LDLIBS := -Lffmpeg/android-libs/$(TARGET_ARCH_ABI) -llog
 include $(BUILD_SHARED_LIBRARY)