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

Change-Id: I2ae7fd4e509667f36880a5ae2f573c916852be19