Merge "Upgrade libmtp to 'libmtp-1-1-16'" am: d91b631914 am: 42c781d54a Change-Id: I82eef987c654f94a5afee95ec84bae4b53058de6