Merge "Move libz to llndk from vndk-sp for non-VNDK-enforced devices."