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

* commit '0ead2a00f4eebb36c2c1206e156fbf1543ee0dd6':
  Fix reading memory usage for 64-bit processes