Merge "Use -Werror in external/liblzf"