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

Change-Id: I68e30dd27043e3e4d2e73e40c3571819ca8cd58d