rework powered/plugged/charging logic

 * Reworks "isPowered/isPluggued/isCharging" code to correctly report
   charging status.  Note that some devices can draw more than 500mA,
   so "plugged" != "charging" (as is assumed in existing code).
   This faulty assumption can result in incorrect charging status
   reported and inability to shutdown at critical battery level.

Change-Id: I6b3282df6513a8c235b0f4cdfd9e16f531e34166
FM Radio: Remove unnecessary line breaks

Fixes keyboard glitch mentioned here: http://review.cyanogenmod.org/#/c/30390/

Change-Id: Ic7fc4ce1efc5272515d317f225b674b7a334bf43
Merge remote-tracking branch 'upstream/jellybean' into jellybean