Merge "coresight: add stm entity id to support diag traffic"