include: Merge oppo changes

Conflicts:
	include/linux/mfd/pm8xxx/pm8921-bms.h
	include/linux/mfd/pm8xxx/pm8921-charger.h
	include/linux/usb/msm_hsusb.h
	include/linux/wcnss_wlan.h
	include/media/msm_camera.h

Change-Id: Iae16f33cdd9b022943ecef62330da8ca650d2f19