am 705a2df9: am c8525edc: Merge "Remove memory monitoring from the system watchdog" into gingerbread

Merge commit '705a2df97c51c3e31ed36831a4302d705e0532b2'

* commit '705a2df97c51c3e31ed36831a4302d705e0532b2':
  Remove memory monitoring from the system watchdog