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

Change-Id: I932705c7220245d824089ce32fe43f2db62a1348