Merge "Add MTP and PTP OS descriptors."