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

Change-Id: Iceca23f2243dcb138b073712ca7b3b63fdb6fa72