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

Change-Id: Ie8259869952aee389cefeb7d1df0a288ceee1a4f