Merge "Fix google-explict-constructor warnings in mtp."
am: b480ab9365

Change-Id: I7285319a159b5d1d42145e6eb9f51849c53df9d3