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

Change-Id: Icf972d53e2b8b7f0201fe180598db02bb36d1b23