Merge "Add libc_headers to header_libs for libpropertyinfoparser" am: 0dd8a9824f
am: 6bee7c52df

Change-Id: If25b10999b209a2736ea37e1011da0031e6b0a92