Merge "Add CONFIG_USB_DUMMY_HCD and update kernel" am: 1af807e741 am: d0f0f0df06
am: 85e3a3b5e1

Change-Id: I7d39c37ffb1a4b66d5a2e427d4187245965244c9