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

Change-Id: Ie7aaee558da27d52cc20574dfea4eb61f68c2901