Merge "Move mtp descriptors into separate source, add tests" am: 729f6f6018
am: 87ecf3ae39

Change-Id: I495d0ffddf4731c27bc2eaf126b4960f15dab36a