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

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

Change-Id: I2d1a8a32e611e6024c37f1e66021fb9d3fb3e00a