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

Change-Id: Ib487d3521c4aab29ad2d188ee568b42b07f76325