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

Change-Id: I4d7bc9be3e614ddd74b5bc30b41f65d8e72e3f5b