Merge "Upgrade libmtp to 'libmtp-1-1-16'"