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

Change-Id: I6461ef056bf41d66d391f52cfb25a680dd61b14e