Merge https://android.googlesource.com/platform/hardware/qcom/camera into jb-devel