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

Change-Id: I3488f2c3fc53d9ba338ec2ec0a76015264c1c4b8