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

Change-Id: If66153336d951f099eb7d273d41c349a83679e26