Merge "Fix incorrect buffer size in NuPlayer" am: aaaad88014 am: 35c6d786d7

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2500456

Change-Id: I3a3a3e3fc965fd7a5396f71284b5907314fe7891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>