Merge "Convert libmtp to soong." am: 3f877d4945 am: 1cd753b1af
am: 33435d749d

Change-Id: Ia31b32d5ec0f6f2eef51b979aae750090834ca32