use cm's camera2 again

Change-Id: I4ed64e55e0208eaf435dd862d6975cbdc1097708