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

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