more fixup with camera wrapper..

Change-Id: I245431b46d63e3392a67fc3c66509157a37be45d
msm8960: Remove QCOM_BSP from here, moving it up

Change-Id: I80d8faf77296b2354e8a757a0a710624dfcfc0c6
Merge branch 'cm-11.0' into martincz