Merge "Mark libprocinfo vendor_avaialable." am: 457ae84df7 am: 2c8e4971c4
am: a9d17ae63c

Change-Id: I108ac344850178dba02366070dccbfc2aad1f5f9