Merge "Move PropertyMap from libutils to libinput"