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

Change-Id: Ia0902d161695d69c77d04894713ea03ee1745813