Merge "Convert libinputservice to Android.bp am: 8cf0d0d2b0"