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

Change-Id: Ic40fb8c80700b4fe2e3b6ff99371408cfe52a6b5