Merge "MediaPlayer2: Remove libdrmframework.so dependency."