Merge "Use -Werror in external/stressapptest" am: 7492904062
am: 00ddbf2caa

Change-Id: Icd0db11d41150bd5299417458ffe08b0debbbe6e