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

Change-Id: Ie277aea1a52a766bc6291952ff837f255051fffb