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

Change-Id: Iaae36b438d4840806cb6dd491607bc9ad9b25cd7