Track slim qcom/camera
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1
Merge branch 'jb-mr1' of https://github.com/tjarnold/platform_manifest into jb-mr1