Merge "Camera: HIDLized camera HALs, first set"