Merge "Convert libmtp to soong."
am: 3f877d4945

Change-Id: I8912c5994c3161f1c29fa1db106317d940e6adfd