Merge "MediaPlayer2: remove libaudioclient.so dependency."