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

Change-Id: If842e7a6244fff05d3a849ac1f0eb700fcc92f60