pyramid/shooter/shooterk: fix mismerge
pyramid: we need to use our own specific camera.default.so here it seems

Change-Id: Ibe152d98b6c01679f120ce7ca97a0ad6d25d34c9
shooter: use device specific vendor-camera.default.so

Change-Id: I740e07a5d3037f0c9fc6d1d21a9c140c5138ddc8
msm8660: drop common vendor-camera.default.so

Change-Id: I30254229891be3b916ad9599adca140af568609e
pyramid/shooter: fix derp
pyramid: oops forgot to include binary (i need sleep lol)

Change-Id: I4af26433bc3df031ce43ea24c9b46e17349d7b56