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

Change-Id: I7d607580d9291953865e910b4e554efe42e94e14