Merge "Convert libmtp to soong." am: 3f877d4945 am: 1cd753b1af am: 33435d749d
am: 971ceda091  -s ours

Change-Id: I41010aa5ffb0ec5a45068c5f7ea6c821816f311c