Merge "Remove obsolete zlib headers." into rvc-dev-plus-aosp am: 8fb7fd1d0e am: 7ad3cf3b91 am: 8fcc762bc5

Change-Id: Ic6ce9937190b1d2897330504dba452474785d00c