Merge "Remove custom timestamp from hw/libhw/input" am: 6b14bd1a08
am: 14f4acea32

Change-Id: Idc9a8c0f3479e12e4d8766f00c1f6d9dcb3170a5