Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Added new charger app

Change-Id: Icc8c7f9bccb08927f593598d13ba2477a23a9dbd