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

Change-Id: I9658388821fa4f3c0a12021f932be5613ef7e5e8