Don't use secure discard anymore

Secure discard made some devices take long time to format cache or other
partitions. People were thinking that the recovery freezed, whish it
most of the time wasn't. It just took sometimes hours. We disable secure
discard from now on.

Change-Id: Iaf00b8e93a7a824c9a9f38d6d309a18ca92e1de0
Fix charging

Still needs cleanup

Change-Id: Ib746858d917c1782f3b9215574d0c61e1805da68