Merge "coresight: add STM support for explicit userspace entity ids"