Merge "Add METADATA for libmtp"
am: b23e73eaa0

Change-Id: Ia40bf5fb8a4ed790a28ae30eb341af41051fd298