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

Change-Id: Ie0782abe3f07e006a90089e352e6a030830239e5