Merge "bundled pjproject: Remove timer cleanup usage patch."