am 40f744e5: am e24e178b: Merge "sensors: move /data/app/sensor_ctl_socket"

* commit '40f744e527e112d3b6204b4352ca2701b3a5f5a0':
  sensors: move /data/app/sensor_ctl_socket