m7-common: set correct USB IDs

HTC One doesn't support PTP by default, so its currently using the same
ID as MTP. Android gadget code seems to suggest it runs through similar
functionality anyway.

Change-Id: I7134f756aa6a6248e3b55edaa349d10e49e5b0d3
m7-common: enable wfd, wifi p2p

Change-Id: I8d95ce5cd9a090385844d6dfea38b8505fbc2fca