Merge "Revert "Add CONFIG_USB_DUMMY_HCD and update kernel"" am: 8fc2f37e77
am: 2358fb4177

Change-Id: I57342a2e8caaa41615180ea1cb3416bde355feec