am f6451116: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f6451116423c6195a464b69b6e07aa8ef743e6b1':
  charger: Do not suspend when disconnecting from charger
  charger: suspend enable in charger mode
  libsuspend: compile as a static library