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

Change-Id: I3d47c5cb1cd78c32f7b768ebb009ba80ff11e92b