am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge

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