Merge "Move libz vndk-sp from ll-ndk" into oc-mr1-dev
am: 28d4818037

Change-Id: Ic058ced0f22045c7141c312537c1c37816868b68