Merge "Use -Werror in external/bzip2" am: a0df5d74ad am: 0d71f00a5f
am: 5c2c573231

Change-Id: Ia0a8ff814fa4e4cfa4ee86d3ccf4587b8545d579