Swap Camera back to aosp

Had to swap back to aosp Camera due to d2 build error related to Camera.