Merge "libcore: rewrite Timer"