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

Change-Id: I7f33066d7bd0e135d1a1e4cd960024225dc7fc23