Merge "Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI"