Merge "stagefright: avoid crash when histogram option is used" into main am:...

Merge "stagefright: avoid crash when histogram option is used" into main am: 2410aa74 am: 8a009cb5

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



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