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

Change-Id: I11bcf3eb60c574a227494991894806623bcd9725