Switch old Camera to aosp and add back Camera2 from aosp.