Merge "Move libz to vndk-sp"