am bc07fb68: am 0bb5c17b: Merge "Make memtrack an optional module."

* commit 'bc07fb6864db9eb206ef4fcbe2916aefd1fe6ff6':
  Make memtrack an optional module.