Fix type mismatch with timer callback signature.
am: 24d616fd34

Change-Id: I6fecf1e636a822dcfe09bc1efff5d835ae1a5c66