Merge "Remove unnecessary static libraries in libmedia2_jni" into pi-dev