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

Change-Id: Ie581a1dceb7a01ac6d32a4e1595c0d2c00d18621