Revert "Swap Camera back to aosp"

This reverts commit fd1c264487f9795462da5098b341fdc0386e45a1.