Merge "Use libz directly from the NDK." into rvc-dev-plus-aosp am: a797ca2ae7

Change-Id: Iea5393bebfb5d4d5e23bdb381f6cbd6af10e843a