Merge "coresight: simplify etm_init_arch_data"