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

Change-Id: Ic3fe0292446b29372a7228b6846163d8ee65c622