Merge "MediaPlayer2: remove libnetd_client dependency."