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

Change-Id: Ibdf85422ce17f3b179d60f20d422893568381a5c