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

Change-Id: I92b694e2c46516c141c3c62c22a2e2e5a89fc749