Merge "Revert "(lib)?sensorservice: Android.mk -> Android.bp""