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

Change-Id: I4436065d935dfb88a90dda18138a1f91ef7e7547