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

Change-Id: I6beb6a19eb5bd756022bb5325538282f51846804