Merge change 9517

* changes:
  We don't need libopencore_author and libcutils in libmedia_jni