Merge "Remove non-tombstoned ANR path."
am: ff95c80198

Change-Id: Ifdf565635e1707822794d88db7117ca5ac986d1d