Changes for VS985

Conflicts:
	drivers/net/wireless/bcmdhd/src/wl/sys/wl_cfg80211.c
	drivers/power/bq24296_charger.c
	drivers/switch/hds_max1462x.c
	drivers/switch/hds_max14688.c
	drivers/usb/dwc3/dwc3-msm.c
	drivers/usb/dwc3/gadget.c
cleanup cached files