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 am: e3182836

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



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