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

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

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



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