Merge "Fix libinput warnings" am: a4767442e3 am: a149886878 am: 35d869c15e
am: fef00db3e5

Change-Id: I558fa030c995220658d79c96fd8ee451363891f5