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

Change-Id: Ia8c4c734a98fca79accfb059f1d7e3885ef79e8d