remove more camera proprietaries

Change-Id: I2ce4c67582f750d131ec9a283023c40ec458b31f