Merge "libpropertyinfoparser: only use system_shared_libs for bionic variant"