Merge "Camera: Remove "camera3.h" dependencies"