Merge changes from topics 'cam-hidl-fence', 'camera-hidl-bufId'

* changes:
  Camera: make fence import agnostic to hidl transport
  Camera: add bufferId field to StreamBuffer