Merge "Include PSTATE in tombstones on arm64." am: ba5351692e am: 807b5e4927
am: 8230790d76

Change-Id: I4b501e61cddc218661aa9df005e9e352f6c752d9