Merge "Use -Werror in external/mtpd" am: e6baa7634b
am: 8dd3de4c6b

Change-Id: I3ff7551dafbb3548ee511e2cc1fc55791cede87f