Revert to old camera libs
Revert "Revert to old camera libs"

This reverts commit a5e099efe84082f99209c5fec6a822ad5c90b192.