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

* commit 'ebadeeabcfeb6c1ece8da62f53ecd8f884e32cee':