Merge "Upgrade libmtp to 'libmtp-1-1-16'"
am: d91b631914

Change-Id: I361df2894d4a0ae5dc1758c30c214888ab017f45