Merge "Move libz vndk-sp from ll-ndk" into oc-mr1-dev