Merge "Use -Werror in external/liblzf" am: 1a709bc5d0
am: 9c7fad232e

Change-Id: Ibebf5c1007bbc06a3b995e6b33ca450f0c2d7e35