Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.04.007.065 on remote branch

Change-Id: I0397dd597c03ed6e6e230dfb0291cebaa42ed540
Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.04.007.065 on remote branch"
msm: perf: Fix standalone compilation

Include perf_trace_counters header file in trace directory to
avoid compile errors when compiling standalone kernel image.

Change-Id: I4cb2928e37357eb6bf5f4118858f558dbe2f7f96
Fix build for GCC 4.7

Change-Id: I4e9265369174d82b55fd435bc47887972f99c9d4
Merge remote-tracking branch 'codeaurora/caf/kk_2.7_rb1.42' into cm-11.0

Conflicts:
	drivers/media/video/msm/msm_vpe.c

Change-Id: I68cc48a1dc3d2ed71c7b013aeb10be7748812769
Merge commit '3d25c15683fdc14fb0fdcc841e12e4eb785f682d' into kk-4.4.x