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

Change-Id: If9a4cf1d3ac09a1a1b853951f3af417669f10c54