am 09a137df: am f49ac52a: Merge "Remove /data/app/sensor_ctl_socket on boot."

* commit '09a137df7572a9a364a4139103acb8e3dab0046e':
  Remove /data/app/sensor_ctl_socket on boot.