Merge "Remove unusued code; MediaPlayerBase and MP.set|getBufferingParams"