Merge "Add libc_headers to header_libs for libpropertyinfoparser"