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