Merge "Use -Werror in external/stressapptest" am: 7492904062 Change-Id: I06becbd026958f2e0b88cf5fe3af630bf6a9c85b