Merge "Use -Werror in external/lzma" am: 33ccf5db61 am: ac40f2d015 am: c5c07c720d
am: 9186d4157a

Change-Id: I7d83e7fa39b76f895d3f22661adeeadbf0c058a0