am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"

* commit '15967d0a8f8f858b0ed6aaf9d5aab5c65b94257f':
  Fix reading memory usage for 64-bit processes