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

Change-Id: I77506268af2b818060a45250d0141251a18e1f7c