Merge "inputflinger: 64-bit compile issues"