Merge "libmemtrack: Properly account for memory usage"