Merge "Camera: fix API1 HAL3 path"