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

Change-Id: Id412e5da207d31c1a981404dc82c893226008270