Merge "With build failure fix: Add stats logging in appDiedLocked."