Merge "stagefright: avoid crash when histogram option is used" into main am: 2410aa74d1 am: 8a009cb5fa am: e6d71cbfab am: 8b76440534 am: 23327e95c8 am: 67309dd769

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>