Revert "Update camera libs, cleanup"

This reverts commit 504590124b0357e97a29eb242fa56dcea895bedb.
Revert "Revert "Revert to old camera libs""

This reverts commit 69896f10fcfcb159767848580f6424bcfabb6635.