Merge "MTP: Add hard coded support to recognize a couple MTP music players for testing purposes."