Merge "Add support for 3.8 version of ICameraDeviceCallback"