Merge "coresight: fix error checks for byte counter init code"