Merge "Move Timer from init to libbase" am: 896297b2ef am: 7ff0b008f7 am: 4e5c4f18d8
am: c0a9cf648b

Change-Id: Idb80a901f4c0080b932b6da247150ed4ffdb6b8e