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

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

Change-Id: Ib1ec21d477f5ca604ea05a800507adb558f011c7