hlte: fix hlte bluetooth crash when using google glass on  bluetooth data conn.

* keep bluesleep tx timeout to 3 second

Change-Id: Iad8e3316b648ff8b0b9178de636edc86f60c07ce
(cherry picked from commit a3ae932c5b6b7f857dd016fd0d0bd84cbef63d4b)
hlte:  bt-gpio: disable gpio power off from suspend.

Fixes issue when reiniting the gpio in bcm chip.

Change-Id: I80d2f84f4ae1fbb1d0c9e829f4838f997d88c7d2
(cherry picked from commit da92e91902e045814c6422cd6367285d5bd1a798)
usb: gadget: mass_storage: added sysfs entry for cdrom to LUNs

This patch adds a "cdrom" sysfs entry for each mass_storage LUN, just
like "ro" sysfs entry. This allows switching between USB and CD-ROM
emulation without reinserting the module or recompiling the kernel.

Change-Id: Idf83c74815b1ad370428ab9d3e5503d5f7bcd3b6
Update platform/msm/
merge define 'CONFIG_FB_MSM_MIPI_SAMSUNG_OCTA_VIDEO_FULL_HD_PT_PANEL'
Fix merge error
Remove camera_v2
hlte disable probe's host-wake gpio.

* stablize bluetooth from crashing.

Change-Id: Ia0591a772f2639f20f96e2575fa1fad5bb7c4b37
(cherry picked from commit ad96b072d4e943f7f9e0fcb824cb21d82680855a)
Merge pull request #1 from sakuraba001/cm-11.0

Merge with source