Merge "Allow access to libz.so in ld.config.txt"