Merge "Move sensord" into oc-dev
am: 903726f55b

Change-Id: I6c55dc0e0e24b418cf33ec5e469f4c00411b63ce