Merge "Revert "8930: Use MPP line for USB ID detection""