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

Change-Id: Ie46dfeb8c57c4edeedbf474a7f5cb414e3ab686e