am 108df9db: am 6e3301dc: Merge "Fix bug 6558006: SystemUI native heap is huge. Fix memory leak" into jb-dev

* commit '108df9dbf267a8a6edae56b7e9d038a5ce23ace9':
  Fix bug 6558006: SystemUI native heap is huge. Fix memory leak