Merge "Fix issue #25371736: Don\'t include z-ram allocations in Android OS" into mnc-dr-dev am: 508559d076
am: 68954d930d

* commit '68954d930d0a583c7150e1a3959d5a798b8e5f34':
  Fix issue #25371736: Don't include z-ram allocations in Android OS