Merge "New APIs for MTP and PTP host support"