Merge "Add METADATA for libmtp" am: b23e73eaa0
am: 9b8a742210

Change-Id: I1520e256fc21214fa9a3289b5e1ff9a0f84953a8