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

Change-Id: I99468607352a9102923cef48b475860a602942f2