Merge "MediaPlayer2: Remove hidden API usage, libcore.io.Streams"