Merge "libprocinfo: fix mac build." am: 3464bc4b43 am: 74f41ee7e7
am: 9389c13c63

Change-Id: I449d55a6b03d643a68ce42a11aab386e991604e1