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