Merge "libutils: increase test TIMING_TOLERANCE_MS" am: 40ffdc681c
am: 814d5a5301

Change-Id: I84a922529d38e5c41729ceabaacd1d3952be95bd