Revert camera: Fix camera storage location

Change-Id: Ib74cb695a248a781a02273be45d0fea8f06e3014