Merge "sensorservice: Android.bp -> Android.mk"