Merge "jtagmm: Add ETM register save-restore support for 8610"