oppo: include/linux/nfc
find5: ifdef changes
oppo: include/linux/usb
oppo: include/media

Conflicts:
	include/media/msm_camera.h
find5: ifdef changes
oppo: kernel
find5: ifdef changes
oppo: kernel/power
find5: ifdef changes
oppo: mm
find5: ifdef changes
oppo: net/bluetooth

Conflicts:
	net/bluetooth/hci_event.c
find5: ifdef changes