Revert "healthd: charger: Modify charger unplug shutdown time to 1s"

This fixes hammerhead off mode charging and shouldn't bother
other devices.

This reverts commit 2e8628e9685c62b2cf881ba9f5aef406713f0175.

Change-Id: Ibe6477884d22e37981a3c5549a3a72aae1963152
Update permissions to the superuser binary

Change-Id: Ia382c74854cfbe625653b8b6b016b37f93132658
Merge branch 'cm-12.0' of github.com:CyanogenMod/android_system_core into cm-12.0