Merge "MediaPlayer2: move MediaPlayer2 native code to libmediaplayer2"