Revert "use legacy Camera"

This reverts commit a7ba0786c3a36da84a323aa3ee99cf02ff67b62d.

Conflicts:
	cd.remove

Change-Id: Ib2d4abd2388b0095f50aea95387754b6d4a6bbae