Merge "Use -Werror in external/expat" am: 1071d2dbae am: 44802c7a43 am: 364e57e220
am: ad171f1861

Change-Id: I5918e1f0b8c5f8d9a0edf03d44a625f9f4ea748f