Merge "base: Remove extra dependencies for libmedia2_jni" into q-keystone-qcom-dev