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 am: e6d71cbf am: 8b764405 am: 23327e95 am: 67309dd7

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



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