Merge "Convert libinputservice to Android.bp" am: a070e55e34 am: 4ad5543b38 am: 8a5ea28a08  -s ours
am: 4173da7da1  -s ours

Change-Id: I8c2d1a623ea7e3ed2f87988073a889cc6997adf8