[Camera2VideoSample] Code update/cleanup