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

* commit 'f326c9fe37ce58f92c52efabf2cebaa383e5d8e8':