Merge "Fix incorrect buffer size in NuPlayer" am: aaaad880 am: 35c6d786 am: d781906b

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



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