Merge "Camera: Update dataspace to new spec, convert for older HALs" into nyc-dev