restore comments from AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.131
restore comments from AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.02.21.131
Merge commit 'a4c64af1ca8d3cf790b541688c105a8a3e32ef9d' into jelly_3.4

Conflicts:
	include/net/bluetooth/sco.h
	kernel/trace/trace.c