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

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