Merge "Add MTP and PTP OS descriptors." am: 159158c3cd
am: 735d9100a1

Change-Id: Id9321090f8d72d817b34e9b59b175f89bf8c5e18