Merge "Fix a bootloop problem when /data/system/usagestats/usage-history.xml...

Merge "Fix a bootloop problem when /data/system/usagestats/usage-history.xml is empty. This often occurs after an incomplete reboot/shutdown or battery pull." into cm-10.2