Merge "Revert "(lib)?sensorservice: Android.mk -> Android.bp"" am: c6a6fd0516 am: 4fe57dd57d am: e9c068b263  -s ours
am: 5f123b446a  -s ours

Change-Id: Iad89e5dc648d5154d577173a9faf0667a7d6e590