Camera: Use original dataspace/format for 3.5 device am: 22f6dcec7e am: 3004b2e5cb
am: 2bc46c99b8

Change-Id: Ifa90afc728ad2a60fd9c4cf6b1d2bd00104f5f6b