Merge "stagefright: null-terminate vendor OMX string extensions" into pi-dev