Merge "Make apex availability of libpropertyinfoparser and libpropertyinfoparser explicit" into main