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

Change-Id: Ib33a789920ea54eb13eafbb37cd973af5125fcdb