Merge "Convert libinputservice to Android.bp" am: a070e55e34
am: 4ad5543b38

Change-Id: Ie902bac8bbca5663241a1d7651693930e06e8bf4