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

Change-Id: Iac70fb16c5fb9ec66b566955177518005a2819a2