Merge "Prototype Content Provider support for MTP/PTP devices."