Merge "avcenc: Only do startcode escaping if the next byte requires it"