Fix charge mode resetting persistent properties

- previously, every boot to charge mode would reset e.g.
persist.sys.dalvik.vm.lib or persist.sys.root_access to defaults.

Change-Id: I60d6104cad370786dfe988ef9fe4f4a857eb879d
Merge branch 'cm-11.0' into kk_mkt