Merge "Suppress ordered-compare-function-pointers warning" am: 9117f884ed am: 751c59d22f am: 410ba11c6c am: 8b18054a32 am: f1245c442f

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

Change-Id: I31bbc7ac0a83d33d069e354572abfbb3fe9700f0