Merge "MediaPlayer2: remove private API usage, Preconditions.checkArgument()"