Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier