Merge "procinfo: Read inode number from /proc/<pid>/maps" am: 81767b1d3d
am: a1752206da

Change-Id: Idec54fc44a77c6bdd6692c87b13af62f90bb3cfd