Merge "HiKey960: Add sys.usb.controller override for newer kernels" am: d4b00a218c
am: 9f6f40eb9b

Change-Id: I3e053da1ad16484e01b74d49a9b34279fcc89c7b