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

Change-Id: I87181cd8db9b2b027da3495a0e50a3bad41b1560