Merge "MediaPlayer2: remove unused libraries."