Revert "pjproject-bundled: Add upstream timer fixes"

This reverts commit cfeb8a59.

The fixes in question cause assert failures when pjproject
asserts are enabled.  Reverting in 13 until a solution is
found for all branches.

Change-Id: Iae5bd340e0543613185fecb63f9c86fa985fe664