camera wrapper: Add moto_msm8960 to build barriers

Change-Id: I98dcd8bfae8d3283f70ba0f8efe6e8f2ca35ab4a
Enable Kernel Samepage Merging by default

Change-Id: I19df3de5c026819e9a8dad0618c5a9678d8c2de7
Merge branch 'cm-11.0' into kk_mkt