Merge "Use -Werror in external/zlib" am: 77813b7ffe
am: 897d9a491e

Change-Id: Ibd41c83e1bc0402beb3726547569a5489d14aa6c