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