Merge "libstatgefright: nts OPL-001-TC4 test failed [1/1]" am: 6b6db5bfdb am: dca14d27c0 am: 775ac580bd am: 56cc4b9794

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

Change-Id: I7235f794b0578d07d59502f69502e461d1f00837