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

Change-Id: I04b5bc05e3a167127135f55c279fa2a66dd49749