Revert "Move libz to vndk-sp"
am: f499bcdde7

Change-Id: I7f641efd4c8e88289496507c7f940db9ea60f745