Merge "Use -Werror in external/valgrind" am: 9187cb4ce2
am: 1df89fb552

Change-Id: I0cbcfd95225d167e36fb91b9dd719d17c8664bae