Merge "Add MTP and PTP OS descriptors." into oc-mr1-dev am: 71113d84ea  -s ours
am: 58106d1954

Change-Id: Ic888672cb3a51e33edd18fef380be09cd20b868e