Merge "Fix incorrect buffer size in NuPlayer"