GitLab

Also take into account the fact that the arm pcsr register is the
fifth entry on its line, so the stack tool previously stripped that
off.

(cherry picked from commit be4de46d)

Change-Id: I0a937ae1a36071c3aaa5d955f56ee034dfdfe7de