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

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

Change-Id: Iecfbc86f979991706d0ac2aba2d337a984985771