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

Change-Id: I2f8548aae68f551034370385bff2aa2749b44470